From: Sebastian Kemper Date: Mon, 11 Feb 2019 20:44:36 +0000 (+0100) Subject: mariadb: fix libmariadb depends X-Git-Url: http://git.openwrt.org/%22https:/collectd.org//%22http:/www.crowdsec.net/%22/%22https:/collectd.org/%22http:/www.crowdsec.net/%22?a=commitdiff_plain;h=f4fda3f7f6b447513fb45dd862f9aa887c434d66;p=feed%2Fpackages.git mariadb: fix libmariadb depends The shared library does not depend on libatomic nor libstdcpp anymore. This is very good news for the users of said lib. This commit updates the depends accordingly. Signed-off-by: Sebastian Kemper --- diff --git a/utils/mariadb/Makefile b/utils/mariadb/Makefile index 6a987d1c07..89d92fa55f 100644 --- a/utils/mariadb/Makefile +++ b/utils/mariadb/Makefile @@ -171,11 +171,14 @@ include $(INCLUDE_DIR)/nls.mk MARIADB_COMMON_DEPENDS := \ $(ICONV_DEPENDS) \ - +libatomic \ +libopenssl \ - +libstdcpp \ +zlib +MARIADB_COMMON_DEPENDS_EXE := \ + $(MARIADB_COMMON_DEPENDS) \ + +libatomic \ + +libstdcpp + # Pass CPPFLAGS in the CFLAGS as otherwise the build system will # ignore them. TARGET_CFLAGS+=$(TARGET_CPPFLAGS) @@ -256,7 +259,7 @@ define Package/mariadb-client-base $(call Package/mariadb/Default) TITLE:=MariaDB database client base DEPENDS:=mariadb-common \ - $(MARIADB_COMMON_DEPENDS) \ + $(MARIADB_COMMON_DEPENDS_EXE) \ +libedit endef @@ -324,7 +327,7 @@ endef define Package/mariadb-server-base $(call Package/mariadb/Default) DEPENDS:=mariadb-common \ - $(MARIADB_COMMON_DEPENDS) \ + $(MARIADB_COMMON_DEPENDS_EXE) \ +!arc:libaio \ +liblzma \ +libpcre \